From: Joakim Verona <joakim@verona.se>
Date: Wed, 14 Aug 2013 06:37:00 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0d50a0024015b4198a75dc70475b351d7c98d74f;p=emacs.git

merge from trunk
---

0d50a0024015b4198a75dc70475b351d7c98d74f